<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
<<<<<<< HEAD
  <h1>你好</h1>  
  <h2>你</h2>
=======
    <b>冲突</b>
  <h1>在</h1>
    
>>>>>>> 1df316796407aa13879726560c25d24069d4a6a4
</body>
</html>